首页 探索 帮助
注册 登录
Kodo
/
kodo
关注 2
点赞 0
派生 0

浏览代码
Merge branch 'tamron' of http://git.xfoto.com.cn/Kodo/kodo into tamron

FFIB 4 年之前
父节点
c04720954b a878a8a0f8
当前提交
1250582e2d
共有 17 个文件被更改，包括 199 次插入 和 227 次删除
显示文件统计
  1. 13 11
      account/migrations/0049_auto_20201130_0148.py
  2. 3 3
      api/member_views.py
  3. 0 28
      coupon/migrations/0016_auto_20201130_0131.py
  4. 40 0
      coupon/migrations/0016_auto_20201202_1203.py
  5. 0 28
      coupon/migrations/0017_auto_20201130_0148.py
  6. 5 3
      group/migrations/0047_auto_20201130_0148.py
  7. 11 9
      integral/migrations/0021_auto_20201130_0148.py
  8. 4 2
      marketcode/migrations/0005_auto_20201130_0148.py
  9. 60 3
      mch/migrations/0058_auto_20201130_0131.py
  10. 0 68
      mch/migrations/0059_auto_20201130_0148.py
  11. 46 14
      member/migrations/0019_auto_20201130_0131.py
  12. 0 43
      member/migrations/0020_auto_20201130_0148.py
  13. 3 6
      message/migrations/0014_auto_20201130_0131.py
  14. 4 2
      pay/migrations/0013_auto_20201130_0148.py
  15. 2 2
      requirements_dj.txt
  16. 2 1
      requirements_pywe.txt
  17. 6 4
      sales/migrations/0009_auto_20201130_0148.py

+ 13 - 11
account/migrations/0049_auto_20201130_0148.py
查看文件 

@@ -1,4 +1,6 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:48
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.29 on 2020-12-02 04:03
3 
+from __future__ import unicode_literals
2 4
3 5 
 from django.db import migrations, models
4 6 
 
@@ -13,51 +15,51 @@ class Migration(migrations.Migration):
13 15 
         migrations.AlterField(
14 16 
             model_name='lensmaninfo',
15 17 
             name='is_common_lensman',
16 
-            field=models.BooleanField(default=False, help_text='是否为普通摄影师', verbose_name='is_common_lensman'),
18 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u666e\u901a\u6444\u5f71\u5e08', verbose_name='is_common_lensman'),
17 19 
         ),
18 20 
         migrations.AlterField(
19 21 
             model_name='lensmaninfo',
20 22 
             name='is_outtake_lensman',
21 
-            field=models.BooleanField(default=False, help_text='是否为花絮摄影师', verbose_name='is_outtake_lensman'),
23 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u82b1\u7d6e\u6444\u5f71\u5e08', verbose_name='is_outtake_lensman'),
22 24 
         ),
23 25 
         migrations.AlterField(
24 26 
             model_name='userinfo',
25 27 
             name='has_membercard',
26 
-            field=models.BooleanField(default=False, help_text='是否激活会员卡', verbose_name='has_membercard'),
28 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u6fc0\u6d3b\u4f1a\u5458\u5361', verbose_name='has_membercard'),
27 29 
         ),
28 30 
         migrations.AlterField(
29 31 
             model_name='userinfo',
30 32 
             name='is_common_lensman',
31 
-            field=models.BooleanField(default=False, help_text='是否为普通摄影师', verbose_name='is_common_lensman'),
33 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u666e\u901a\u6444\u5f71\u5e08', verbose_name='is_common_lensman'),
32 34 
         ),
33 35 
         migrations.AlterField(
34 36 
             model_name='userinfo',
35 37 
             name='is_maintenance',
36 
-            field=models.BooleanField(default=False, help_text='是否维修员', verbose_name='is_maintenance'),
38 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u7ef4\u4fee\u5458', verbose_name='is_maintenance'),
37 39 
         ),
38 40 
         migrations.AlterField(
39 41 
             model_name='userinfo',
40 42 
             name='is_outtake_lensman',
41 
-            field=models.BooleanField(default=False, help_text='是否为花絮摄影师', verbose_name='is_outtake_lensman'),
43 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u82b1\u7d6e\u6444\u5f71\u5e08', verbose_name='is_outtake_lensman'),
42 44 
         ),
43 45 
         migrations.AlterField(
44 46 
             model_name='userinfo',
45 47 
             name='islensman',
46 
-            field=models.BooleanField(default=False, help_text='摄影师？', verbose_name='islensman'),
48 
+            field=models.BooleanField(default=False, help_text='\u6444\u5f71\u5e08\uff1f', verbose_name='islensman'),
47 49 
         ),
48 50 
         migrations.AlterField(
49 51 
             model_name='userinfo',
50 52 
             name='istourguide',
51 
-            field=models.BooleanField(default=False, help_text='导游？', verbose_name='istourguide'),
53 
+            field=models.BooleanField(default=False, help_text='\u5bfc\u6e38\uff1f', verbose_name='istourguide'),
52 54 
         ),
53 55 
         migrations.AlterField(
54 56 
             model_name='userinfo',
55 57 
             name='new_subscribe',
56 
-            field=models.BooleanField(default=False, help_text='是否新增关注', verbose_name='new_subscribe'),
58 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u65b0\u589e\u5173\u6ce8', verbose_name='new_subscribe'),
57 59 
         ),
58 60 
         migrations.AlterField(
59 61 
             model_name='userinfo',
60 62 
             name='test_user',
61 
-            field=models.BooleanField(default=False, help_text='是否为测试用户', verbose_name='test_user'),
63 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u6d4b\u8bd5\u7528\u6237', verbose_name='test_user'),
62 64 
         ),
63 65 
     ]

+ 3 - 3
api/member_views.py
查看文件 

@@ -441,14 +441,14 @@ def activity_group_share(request):
441 441 
     click_user_id = request.POST.get('click_user_id', '')
442 442 
     activity_id = request.POST.get('activity_id')
443 443
444 
+    iv = request.POST.get('iv', '')
445 
+    encryptedData = request.POST.get('encryptedData', '')
446 
+
444 447 
     wxcfg = WECHAT.get('MINIAPP', {})
445 448
446 449 
     appid = wxcfg.get('appID')
447 450 
     secret = wxcfg.get('appsecret')
448 451
449 
-    iv = request.POST.get('iv', '')
450 
-    encryptedData = request.POST.get('encryptedData', '')
451 
-
452 452 
     # {
453 453 
     #     "openGId": "OPENGID"
454 454 
     # }

+ 0 - 28
coupon/migrations/0016_auto_20201130_0131.py
查看文件 

@@ -1,28 +0,0 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:31
2 
-
3 
-from django.db import migrations, models
4 
-
5 
-
6 
-class Migration(migrations.Migration):
7 
-
8 
-    dependencies = [
9 
-        ('coupon', '0015_auto_20200727_1720'),
10 
-    ]
11 
-
12 
-    operations = [
13 
-        migrations.AlterField(
14 
-            model_name='couponinfo',
15 
-            name='status',
16 
-            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
17 
-        ),
18 
-        migrations.AlterField(
19 
-            model_name='usercouponinfo',
20 
-            name='coupon_from',
21 
-            field=models.CharField(blank=True, db_index=True, default='MEMBER_BENEFITS', help_text='劵来源', max_length=32, null=True, verbose_name='coupon_from'),
22 
-        ),
23 
-        migrations.AlterField(
24 
-            model_name='usercouponinfo',
25 
-            name='status',
26 
-            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
27 
-        ),
28 
-    ]

+ 40 - 0
coupon/migrations/0016_auto_20201202_1203.py
查看文件 

@@ -0,0 +1,40 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.29 on 2020-12-02 04:03
3 
+from __future__ import unicode_literals
4 
+
5 
+from django.db import migrations, models
6 
+
7 
+
8 
+class Migration(migrations.Migration):
9 
+
10 
+    dependencies = [
11 
+        ('coupon', '0015_auto_20200727_1720'),
12 
+    ]
13 
+
14 
+    operations = [
15 
+        migrations.AlterField(
16 
+            model_name='couponinfo',
17 
+            name='is_coupon_admin_writeoff',
18 
+            field=models.BooleanField(default=True, help_text='\u662f\u5426\u662f\u7ba1\u7406\u5458\u6838\u9500', verbose_name='is_coupon_admin_writeoff'),
19 
+        ),
20 
+        migrations.AlterField(
21 
+            model_name='couponinfo',
22 
+            name='status',
23 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
24 
+        ),
25 
+        migrations.AlterField(
26 
+            model_name='usercouponinfo',
27 
+            name='has_used',
28 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u5df2\u6838\u9500', verbose_name='has_used'),
29 
+        ),
30 
+        migrations.AlterField(
31 
+            model_name='usercouponinfo',
32 
+            name='is_coupon_admin_writeoff',
33 
+            field=models.BooleanField(default=True, help_text='\u662f\u5426\u662f\u7ba1\u7406\u5458\u6838\u9500', verbose_name='is_coupon_admin_writeoff'),
34 
+        ),
35 
+        migrations.AlterField(
36 
+            model_name='usercouponinfo',
37 
+            name='status',
38 
+            field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
39 
+        ),
40 
+    ]

+ 0 - 28
coupon/migrations/0017_auto_20201130_0148.py
查看文件 

@@ -1,28 +0,0 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:48
2 
-
3 
-from django.db import migrations, models
4 
-
5 
-
6 
-class Migration(migrations.Migration):
7 
-
8 
-    dependencies = [
9 
-        ('coupon', '0016_auto_20201130_0131'),
10 
-    ]
11 
-
12 
-    operations = [
13 
-        migrations.AlterField(
14 
-            model_name='couponinfo',
15 
-            name='is_coupon_admin_writeoff',
16 
-            field=models.BooleanField(default=True, help_text='是否是管理员核销', verbose_name='is_coupon_admin_writeoff'),
17 
-        ),
18 
-        migrations.AlterField(
19 
-            model_name='usercouponinfo',
20 
-            name='has_used',
21 
-            field=models.BooleanField(default=False, help_text='是否已核销', verbose_name='has_used'),
22 
-        ),
23 
-        migrations.AlterField(
24 
-            model_name='usercouponinfo',
25 
-            name='is_coupon_admin_writeoff',
26 
-            field=models.BooleanField(default=True, help_text='是否是管理员核销', verbose_name='is_coupon_admin_writeoff'),
27 
-        ),
28 
-    ]

+ 5 - 3
group/migrations/0047_auto_20201130_0148.py
查看文件 

@@ -1,4 +1,6 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:48
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.29 on 2020-12-02 04:03
3 
+from __future__ import unicode_literals
2 4
3 5 
 from django.db import migrations, models
4 6 
 
@@ -13,11 +15,11 @@ class Migration(migrations.Migration):
13 15 
         migrations.AlterField(
14 16 
             model_name='groupphotoinfo',
15 17 
             name='has_watermark',
16 
-            field=models.BooleanField(default=False, help_text='是否有水印', verbose_name='has_watermark'),
18 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u6709\u6c34\u5370', verbose_name='has_watermark'),
17 19 
         ),
18 20 
         migrations.AlterField(
19 21 
             model_name='photothumbupinfo',
20 22 
             name='thumbup',
21 
-            field=models.BooleanField(default=True, help_text='用户点赞', verbose_name='thumbup'),
23 
+            field=models.BooleanField(default=True, help_text='\u7528\u6237\u70b9\u8d5e', verbose_name='thumbup'),
22 24 
         ),
23 25 
     ]

+ 11 - 9
integral/migrations/0021_auto_20201130_0148.py
查看文件 

@@ -1,4 +1,6 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:48
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.29 on 2020-12-02 04:03
3 
+from __future__ import unicode_literals
2 4
3 5 
 from django.db import migrations, models
4 6 
 
@@ -13,41 +15,41 @@ class Migration(migrations.Migration):
13 15 
         migrations.AlterField(
14 16 
             model_name='saleclerkintegralincomeexpensesinfo',
15 17 
             name='test_user',
16 
-            field=models.BooleanField(default=False, help_text='是否为测试用户', verbose_name='test_user'),
18 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u6d4b\u8bd5\u7528\u6237', verbose_name='test_user'),
17 19 
         ),
18 20 
         migrations.AlterField(
19 21 
             model_name='saleclerksubmitloginfo',
20 22 
             name='dupload',
21 
-            field=models.BooleanField(default=False, help_text='是否为重复提交', verbose_name='dupload'),
23 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u91cd\u590d\u63d0\u4ea4', verbose_name='dupload'),
22 24 
         ),
23 25 
         migrations.AlterField(
24 26 
             model_name='saleclerksubmitloginfo',
25 27 
             name='has_scan',
26 
-            field=models.BooleanField(default=False, help_text='是否被消费者扫过', verbose_name='has_scan'),
28 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u88ab\u6d88\u8d39\u8005\u626b\u8fc7', verbose_name='has_scan'),
27 29 
         ),
28 30 
         migrations.AlterField(
29 31 
             model_name='saleclerksubmitloginfo',
30 32 
             name='is_staff_delete',
31 
-            field=models.BooleanField(default=False, help_text='是否管理员删除', verbose_name='is_staff_delete'),
33 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u7ba1\u7406\u5458\u5220\u9664', verbose_name='is_staff_delete'),
32 34 
         ),
33 35 
         migrations.AlterField(
34 36 
             model_name='saleclerksubmitloginfo',
35 37 
             name='is_upload_qiniu',
36 
-            field=models.BooleanField(default=False, help_text='是否已上传七牛', verbose_name='is_upload_qiniu'),
38 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u5df2\u4e0a\u4f20\u4e03\u725b', verbose_name='is_upload_qiniu'),
37 39 
         ),
38 40 
         migrations.AlterField(
39 41 
             model_name='saleclerksubmitloginfo',
40 42 
             name='is_wxwork',
41 
-            field=models.BooleanField(default=False, help_text='是否为企业微信端', verbose_name='is_wxwork'),
43 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u4f01\u4e1a\u5fae\u4fe1\u7aef', verbose_name='is_wxwork'),
42 44 
         ),
43 45 
         migrations.AlterField(
44 46 
             model_name='saleclerksubmitloginfo',
45 47 
             name='test_sn',
46 
-            field=models.BooleanField(default=False, help_text='是否为测试序列号', verbose_name='test_sn'),
48 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u6d4b\u8bd5\u5e8f\u5217\u53f7', verbose_name='test_sn'),
47 49 
         ),
48 50 
         migrations.AlterField(
49 51 
             model_name='saleclerksubmitloginfo',
50 52 
             name='test_user',
51 
-            field=models.BooleanField(default=False, help_text='是否为测试用户', verbose_name='test_user'),
53 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u6d4b\u8bd5\u7528\u6237', verbose_name='test_user'),
52 54 
         ),
53 55 
     ]

+ 4 - 2
marketcode/migrations/0005_auto_20201130_0148.py
查看文件 

@@ -1,4 +1,6 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:48
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.29 on 2020-12-02 04:03
3 
+from __future__ import unicode_literals
2 4
3 5 
 from django.db import migrations, models
4 6 
 
@@ -13,6 +15,6 @@ class Migration(migrations.Migration):
13 15 
         migrations.AlterField(
14 16 
             model_name='marketcodeinfo',
15 17 
             name='has_used',
16 
-            field=models.BooleanField(default=False, help_text='是否已使用', verbose_name='has_used'),
18 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u5df2\u4f7f\u7528', verbose_name='has_used'),
17 19 
         ),
18 20 
     ]

+ 60 - 3
mch/migrations/0058_auto_20201130_0131.py
查看文件 

@@ -1,4 +1,6 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:31
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.29 on 2020-12-02 04:03
3 
+from __future__ import unicode_literals
2 4
3 5 
 from django.db import migrations, models
4 6 
 
@@ -37,10 +39,30 @@ class Migration(migrations.Migration):
37 39 
         ),
38 40 
         migrations.AlterField(
39 41 
             model_name='consumeinfosubmitloginfo',
42 
+            name='dupload',
43 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u91cd\u590d\u63d0\u4ea4', verbose_name='dupload'),
44 
+        ),
45 
+        migrations.AlterField(
46 
+            model_name='consumeinfosubmitloginfo',
47 
+            name='has_used',
48 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u5df2\u6838\u9500', verbose_name='has_used'),
49 
+        ),
50 
+        migrations.AlterField(
51 
+            model_name='consumeinfosubmitloginfo',
40 52 
             name='status',
41 53 
             field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
42 54 
         ),
43 55 
         migrations.AlterField(
56 
+            model_name='consumeinfosubmitloginfo',
57 
+            name='submit_during_activity',
58 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u6d3b\u52a8\u671f\u95f4\u4e0a\u4f20', verbose_name='submit_during_activity'),
59 
+        ),
60 
+        migrations.AlterField(
61 
+            model_name='consumeinfosubmitloginfo',
62 
+            name='test_user',
63 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u6d4b\u8bd5\u7528\u6237', verbose_name='test_user'),
64 
+        ),
65 
+        migrations.AlterField(
44 66 
             model_name='distributorinfo',
45 67 
             name='status',
46 68 
             field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
 
@@ -58,7 +80,7 @@ class Migration(migrations.Migration):
58 80 
         migrations.AlterField(
59 81 
             model_name='maintenancemaninfo',
60 82 
             name='sex',
61 
-            field=models.IntegerField(choices=[(0, '未知'), (1, '男'), (2, '女')], default=0, help_text='Sex', verbose_name='sex'),
83 
+            field=models.IntegerField(choices=[(0, '\u672a\u77e5'), (1, '\u7537'), (2, '\u5973')], default=0, help_text='Sex', verbose_name='sex'),
62 84 
         ),
63 85 
         migrations.AlterField(
64 86 
             model_name='maintenancemaninfo',
 
@@ -67,6 +89,16 @@ class Migration(migrations.Migration):
67 89 
         ),
68 90 
         migrations.AlterField(
69 91 
             model_name='modelcamerabodyinfo',
92 
+            name='is_ILDC',
93 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u9700\u8981\u539f\u5382\u8f6c\u63a5\u73af', verbose_name='is_ILDC'),
94 
+        ),
95 
+        migrations.AlterField(
96 
+            model_name='modelcamerabodyinfo',
97 
+            name='is_important',
98 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u91cd\u8981\u578b\u53f7', verbose_name='is_important'),
99 
+        ),
100 
+        migrations.AlterField(
101 
+            model_name='modelcamerabodyinfo',
70 102 
             name='status',
71 103 
             field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
72 104 
         ),
 
@@ -77,6 +109,16 @@ class Migration(migrations.Migration):
77 109 
         ),
78 110 
         migrations.AlterField(
79 111 
             model_name='modelinfo',
112 
+            name='display',
113 
+            field=models.BooleanField(default=True, help_text='Display', verbose_name='display'),
114 
+        ),
115 
+        migrations.AlterField(
116 
+            model_name='modelinfo',
117 
+            name='is_important',
118 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u91cd\u8981\u578b\u53f7', verbose_name='is_important'),
119 
+        ),
120 
+        migrations.AlterField(
121 
+            model_name='modelinfo',
80 122 
             name='status',
81 123 
             field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
82 124 
         ),
 
@@ -87,12 +129,27 @@ class Migration(migrations.Migration):
87 129 
         ),
88 130 
         migrations.AlterField(
89 131 
             model_name='saleclerkinfo',
132 
+            name='is_auth',
133 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u5df2\u6388\u6743', verbose_name='is_auth'),
134 
+        ),
135 
+        migrations.AlterField(
136 
+            model_name='saleclerkinfo',
137 
+            name='is_online_sales',
138 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u7f51\u9500', verbose_name='is_online_sales'),
139 
+        ),
140 
+        migrations.AlterField(
141 
+            model_name='saleclerkinfo',
90 142 
             name='sex',
91 
-            field=models.IntegerField(choices=[(0, '未知'), (1, '男'), (2, '女')], default=0, help_text='Sex', verbose_name='sex'),
143 
+            field=models.IntegerField(choices=[(0, '\u672a\u77e5'), (1, '\u7537'), (2, '\u5973')], default=0, help_text='Sex', verbose_name='sex'),
92 144 
         ),
93 145 
         migrations.AlterField(
94 146 
             model_name='saleclerkinfo',
95 147 
             name='status',
96 148 
             field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
97 149 
         ),
150 
+        migrations.AlterField(
151 
+            model_name='saleclerkinfo',
152 
+            name='test_user',
153 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u4e3a\u6d4b\u8bd5\u7528\u6237', verbose_name='test_user'),
154 
+        ),
98 155 
     ]

+ 0 - 68
mch/migrations/0059_auto_20201130_0148.py
查看文件 

@@ -1,68 +0,0 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:48
2 
-
3 
-from django.db import migrations, models
4 
-
5 
-
6 
-class Migration(migrations.Migration):
7 
-
8 
-    dependencies = [
9 
-        ('mch', '0058_auto_20201130_0131'),
10 
-    ]
11 
-
12 
-    operations = [
13 
-        migrations.AlterField(
14 
-            model_name='consumeinfosubmitloginfo',
15 
-            name='dupload',
16 
-            field=models.BooleanField(default=False, help_text='是否为重复提交', verbose_name='dupload'),
17 
-        ),
18 
-        migrations.AlterField(
19 
-            model_name='consumeinfosubmitloginfo',
20 
-            name='has_used',
21 
-            field=models.BooleanField(default=False, help_text='是否已核销', verbose_name='has_used'),
22 
-        ),
23 
-        migrations.AlterField(
24 
-            model_name='consumeinfosubmitloginfo',
25 
-            name='submit_during_activity',
26 
-            field=models.BooleanField(default=False, help_text='是否为活动期间上传', verbose_name='submit_during_activity'),
27 
-        ),
28 
-        migrations.AlterField(
29 
-            model_name='consumeinfosubmitloginfo',
30 
-            name='test_user',
31 
-            field=models.BooleanField(default=False, help_text='是否为测试用户', verbose_name='test_user'),
32 
-        ),
33 
-        migrations.AlterField(
34 
-            model_name='modelcamerabodyinfo',
35 
-            name='is_ILDC',
36 
-            field=models.BooleanField(default=False, help_text='是否需要原厂转接环', verbose_name='is_ILDC'),
37 
-        ),
38 
-        migrations.AlterField(
39 
-            model_name='modelcamerabodyinfo',
40 
-            name='is_important',
41 
-            field=models.BooleanField(default=False, help_text='是否重要型号', verbose_name='is_important'),
42 
-        ),
43 
-        migrations.AlterField(
44 
-            model_name='modelinfo',
45 
-            name='display',
46 
-            field=models.BooleanField(default=True, help_text='Display', verbose_name='display'),
47 
-        ),
48 
-        migrations.AlterField(
49 
-            model_name='modelinfo',
50 
-            name='is_important',
51 
-            field=models.BooleanField(default=False, help_text='是否重要型号', verbose_name='is_important'),
52 
-        ),
53 
-        migrations.AlterField(
54 
-            model_name='saleclerkinfo',
55 
-            name='is_auth',
56 
-            field=models.BooleanField(default=False, help_text='是否已授权', verbose_name='is_auth'),
57 
-        ),
58 
-        migrations.AlterField(
59 
-            model_name='saleclerkinfo',
60 
-            name='is_online_sales',
61 
-            field=models.BooleanField(default=False, help_text='是否为网销', verbose_name='is_online_sales'),
62 
-        ),
63 
-        migrations.AlterField(
64 
-            model_name='saleclerkinfo',
65 
-            name='test_user',
66 
-            field=models.BooleanField(default=False, help_text='是否为测试用户', verbose_name='test_user'),
67 
-        ),
68 
-    ]

+ 46 - 14
member/migrations/0019_auto_20201130_0131.py
查看文件 

@@ -1,4 +1,6 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:31
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.29 on 2020-12-02 04:03
3 
+from __future__ import unicode_literals
2 4
3 5 
 from django.db import migrations, models
4 6 
 import shortuuidfield.fields
 
@@ -18,26 +20,36 @@ class Migration(migrations.Migration):
18 20 
                 ('status', models.BooleanField(default=True, help_text='Status', verbose_name='status')),
19 21 
                 ('created_at', models.DateTimeField(auto_now_add=True, help_text='Create Time', verbose_name='created_at')),
20 22 
                 ('updated_at', models.DateTimeField(auto_now=True, help_text='Update Time', verbose_name='updated_at')),
21 
-                ('brand_id', models.CharField(blank=True, db_index=True, help_text='品牌唯一标识', max_length=32, null=True, verbose_name='brand_id')),
22 
-                ('brand_name', models.CharField(blank=True, help_text='品牌名称', max_length=255, null=True, verbose_name='brand_name')),
23 
-                ('group_share_id', shortuuidfield.fields.ShortUUIDField(blank=True, db_index=True, editable=False, help_text='活动群组分享唯一标识', max_length=22, null=True, unique=True)),
24 
-                ('share_user_id', models.CharField(blank=True, db_index=True, help_text='分享用户唯一标识', max_length=32, null=True, verbose_name='share_user_id')),
25 
-                ('click_user_id', models.CharField(blank=True, db_index=True, help_text='点击用户唯一标识', max_length=32, null=True, verbose_name='click_user_id')),
26 
-                ('open_gid', models.CharField(blank=True, db_index=True, help_text='群组唯一标识', max_length=32, null=True, verbose_name='open_gid')),
27 
-                ('activity_id', models.CharField(blank=True, db_index=True, help_text='活动唯一标识', max_length=32, null=True, verbose_name='activity_id')),
28 
-                ('title', models.CharField(blank=True, help_text='活动名称', max_length=255, null=True, verbose_name='title')),
29 
-                ('is_integral', models.BooleanField(default=False, help_text='是否有积分', verbose_name='is_integral')),
30 
-                ('integral', models.IntegerField(default=0, help_text='积分', verbose_name='integral')),
23 
+                ('brand_id', models.CharField(blank=True, db_index=True, help_text='\u54c1\u724c\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='brand_id')),
24 
+                ('brand_name', models.CharField(blank=True, help_text='\u54c1\u724c\u540d\u79f0', max_length=255, null=True, verbose_name='brand_name')),
25 
+                ('group_share_id', shortuuidfield.fields.ShortUUIDField(blank=True, db_index=True, editable=False, help_text='\u6d3b\u52a8\u7fa4\u7ec4\u5206\u4eab\u552f\u4e00\u6807\u8bc6', max_length=22, null=True, unique=True)),
26 
+                ('share_user_id', models.CharField(blank=True, db_index=True, help_text='\u5206\u4eab\u7528\u6237\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='share_user_id')),
27 
+                ('click_user_id', models.CharField(blank=True, db_index=True, help_text='\u70b9\u51fb\u7528\u6237\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='click_user_id')),
28 
+                ('open_gid', models.CharField(blank=True, db_index=True, help_text='\u7fa4\u7ec4\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='open_gid')),
29 
+                ('activity_id', models.CharField(blank=True, db_index=True, help_text='\u6d3b\u52a8\u552f\u4e00\u6807\u8bc6', max_length=32, null=True, verbose_name='activity_id')),
30 
+                ('title', models.CharField(blank=True, help_text='\u6d3b\u52a8\u540d\u79f0', max_length=255, null=True, verbose_name='title')),
31 
+                ('is_integral', models.BooleanField(default=False, help_text='\u662f\u5426\u6709\u79ef\u5206', verbose_name='is_integral')),
32 
+                ('integral', models.IntegerField(default=0, help_text='\u79ef\u5206', verbose_name='integral')),
31 33 
             ],
32 34 
             options={
33 
-                'verbose_name': '会员活动群组分享信息',
34 
-                'verbose_name_plural': '会员活动群组分享信息',
35 
+                'verbose_name': '\u4f1a\u5458\u6d3b\u52a8\u7fa4\u7ec4\u5206\u4eab\u4fe1\u606f',
36 
+                'verbose_name_plural': '\u4f1a\u5458\u6d3b\u52a8\u7fa4\u7ec4\u5206\u4eab\u4fe1\u606f',
35 37 
             },
36 38 
         ),
37 39 
         migrations.AddField(
38 40 
             model_name='memberactivityinfo',
39 41 
             name='group_share_integral',
40 
-            field=models.IntegerField(default=0, help_text='群组分享会员积分', verbose_name='group_share_integral'),
42 
+            field=models.IntegerField(default=0, help_text='\u7fa4\u7ec4\u5206\u4eab\u4f1a\u5458\u79ef\u5206', verbose_name='group_share_integral'),
43 
+        ),
44 
+        migrations.AlterField(
45 
+            model_name='goodsinfo',
46 
+            name='is_slider',
47 
+            field=models.BooleanField(default=True, help_text='\u662f\u5426\u4e3a\u8f6e\u64ad\u5546\u54c1', verbose_name='is_slider'),
48 
+        ),
49 
+        migrations.AlterField(
50 
+            model_name='goodsinfo',
51 
+            name='only_for_member',
52 
+            field=models.BooleanField(default=False, help_text='\u4f1a\u5458\u4e13\u5c5e', verbose_name='only_for_member'),
41 53 
         ),
42 54 
         migrations.AlterField(
43 55 
             model_name='goodsinfo',
 
@@ -46,11 +58,26 @@ class Migration(migrations.Migration):
46 58 
         ),
47 59 
         migrations.AlterField(
48 60 
             model_name='goodsorderinfo',
61 
+            name='has_send_template_message',
62 
+            field=models.BooleanField(default=True, help_text='\u662f\u5426\u5df2\u53d1\u9001\u6a21\u7248\u6d88\u606f', verbose_name='has_send_template_message'),
63 
+        ),
64 
+        migrations.AlterField(
65 
+            model_name='goodsorderinfo',
49 66 
             name='status',
50 67 
             field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
51 68 
         ),
52 69 
         migrations.AlterField(
53 70 
             model_name='memberactivityinfo',
71 
+            name='is_signup',
72 
+            field=models.BooleanField(default=True, help_text='\u662f\u5426\u6709\u62a5\u540d\u529f\u80fd', verbose_name='is_signup'),
73 
+        ),
74 
+        migrations.AlterField(
75 
+            model_name='memberactivityinfo',
76 
+            name='is_slider',
77 
+            field=models.BooleanField(default=True, help_text='\u662f\u5426\u4e3a\u8f6e\u64ad\u6d3b\u52a8', verbose_name='is_slider'),
78 
+        ),
79 
+        migrations.AlterField(
80 
+            model_name='memberactivityinfo',
54 81 
             name='status',
55 82 
             field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
56 83 
         ),
 
@@ -66,6 +93,11 @@ class Migration(migrations.Migration):
66 93 
         ),
67 94 
         migrations.AlterField(
68 95 
             model_name='rightinfo',
96 
+            name='is_send_coupon',
97 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u53d1\u5238', verbose_name='is_send_coupon'),
98 
+        ),
99 
+        migrations.AlterField(
100 
+            model_name='rightinfo',
69 101 
             name='status',
70 102 
             field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
71 103 
         ),

+ 0 - 43
member/migrations/0020_auto_20201130_0148.py
查看文件 

@@ -1,43 +0,0 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:48
2 
-
3 
-from django.db import migrations, models
4 
-
5 
-
6 
-class Migration(migrations.Migration):
7 
-
8 
-    dependencies = [
9 
-        ('member', '0019_auto_20201130_0131'),
10 
-    ]
11 
-
12 
-    operations = [
13 
-        migrations.AlterField(
14 
-            model_name='goodsinfo',
15 
-            name='is_slider',
16 
-            field=models.BooleanField(default=True, help_text='是否为轮播商品', verbose_name='is_slider'),
17 
-        ),
18 
-        migrations.AlterField(
19 
-            model_name='goodsinfo',
20 
-            name='only_for_member',
21 
-            field=models.BooleanField(default=False, help_text='会员专属', verbose_name='only_for_member'),
22 
-        ),
23 
-        migrations.AlterField(
24 
-            model_name='goodsorderinfo',
25 
-            name='has_send_template_message',
26 
-            field=models.BooleanField(default=True, help_text='是否已发送模版消息', verbose_name='has_send_template_message'),
27 
-        ),
28 
-        migrations.AlterField(
29 
-            model_name='memberactivityinfo',
30 
-            name='is_signup',
31 
-            field=models.BooleanField(default=True, help_text='是否有报名功能', verbose_name='is_signup'),
32 
-        ),
33 
-        migrations.AlterField(
34 
-            model_name='memberactivityinfo',
35 
-            name='is_slider',
36 
-            field=models.BooleanField(default=True, help_text='是否为轮播活动', verbose_name='is_slider'),
37 
-        ),
38 
-        migrations.AlterField(
39 
-            model_name='rightinfo',
40 
-            name='is_send_coupon',
41 
-            field=models.BooleanField(default=False, help_text='是否发券', verbose_name='is_send_coupon'),
42 
-        ),
43 
-    ]

+ 3 - 6
message/migrations/0014_auto_20201130_0131.py
查看文件 

@@ -1,4 +1,6 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:31
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.29 on 2020-12-02 04:03
3 
+from __future__ import unicode_literals
2 4
3 5 
 from django.db import migrations, models
4 6 
 
@@ -27,11 +29,6 @@ class Migration(migrations.Migration):
27 29 
         ),
28 30 
         migrations.AlterField(
29 31 
             model_name='usermessageinfo',
30 
-            name='msg_type',
31 
-            field=models.CharField(db_index=True, default='system', help_text='消息类型', max_length=8, verbose_name='msg_type'),
32 
-        ),
33 
-        migrations.AlterField(
34 
-            model_name='usermessageinfo',
35 32 
             name='status',
36 33 
             field=models.BooleanField(default=True, help_text='Status', verbose_name='status'),
37 34 
         ),

+ 4 - 2
pay/migrations/0013_auto_20201130_0148.py
查看文件 

@@ -1,4 +1,6 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:48
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.29 on 2020-12-02 04:03
3 
+from __future__ import unicode_literals
2 4
3 5 
 from django.db import migrations, models
4 6 
 
@@ -13,6 +15,6 @@ class Migration(migrations.Migration):
13 15 
         migrations.AlterField(
14 16 
             model_name='orderinfo',
15 17 
             name='reback_status',
16 
-            field=models.BooleanField(default=False, help_text='退款状态', verbose_name='reback_status'),
18 
+            field=models.BooleanField(default=False, help_text='\u9000\u6b3e\u72b6\u6001', verbose_name='reback_status'),
17 19 
         ),
18 20 
     ]

+ 2 - 2
requirements_dj.txt
查看文件 

@@ -1,6 +1,6 @@
1 1 
 Django==1.11.29
2 2 
 django-admin==2.0.1
3 
-django-cors-headers==3.0.2
3 
+django-cors-headers==3.5.0
4 4 
 django-curtail-uuid==1.0.4
5 5 
 django-daterange-filter==1.3.0
6 6 
 django-detect==1.0.18
 
@@ -23,4 +23,4 @@ django-shortuuidfield==0.1.3
23 23 
 django-six==1.0.4
24 24 
 django-uniapi==1.0.10
25 25 
 django-we==1.5.6
26 
-djangorestframework==3.7.7
26 
+djangorestframework==3.12.2

+ 2 - 1
requirements_pywe.txt
查看文件 

@@ -1,10 +1,11 @@
1 
+pyqywe_miniapp==1.0.0
1 2 
 pywe-card==1.0.0
2 3 
 pywe-component==1.0.1
3 4 
 pywe-component-authorizer-token==1.1.1
4 5 
 pywe-component-preauthcode==1.0.3
5 6 
 pywe-jssdk==1.1.0
6 7 
 pywe-marketcode==1.0.3
7 
-pywe-membercard==1.0.1
8 
+pywe-membercard==1.0.3
8 9 
 pywe-custom-message==1.0.1
9 10 
 pywe-event-message==1.0.1
10 11 
 pywe-miniapp==1.1.6

+ 6 - 4
sales/migrations/0009_auto_20201130_0148.py
查看文件 

@@ -1,4 +1,6 @@
1 
-# Generated by Django 2.2.15 on 2020-11-29 17:48
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.29 on 2020-12-02 04:03
3 
+from __future__ import unicode_literals
2 4
3 5 
 from django.db import migrations, models
4 6 
 
@@ -13,16 +15,16 @@ class Migration(migrations.Migration):
13 15 
         migrations.AlterField(
14 16 
             model_name='salesresponsibilityinfo',
15 17 
             name='is_auth',
16 
-            field=models.BooleanField(default=False, help_text='是否已授权', verbose_name='is_auth'),
18 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u5df2\u6388\u6743', verbose_name='is_auth'),
17 19 
         ),
18 20 
         migrations.AlterField(
19 21 
             model_name='salesresponsibilityinfo',
20 22 
             name='is_super',
21 
-            field=models.BooleanField(default=False, help_text='是否超级销售担当', verbose_name='is_super'),
23 
+            field=models.BooleanField(default=False, help_text='\u662f\u5426\u8d85\u7ea7\u9500\u552e\u62c5\u5f53', verbose_name='is_super'),
22 24 
         ),
23 25 
         migrations.AlterField(
24 26 
             model_name='salesresponsibilityinfomodelssalestatisticinfo',
25 27 
             name='is_important',
26 
-            field=models.BooleanField(default=True, help_text='是否重要型号', verbose_name='is_important'),
28 
+            field=models.BooleanField(default=True, help_text='\u662f\u5426\u91cd\u8981\u578b\u53f7', verbose_name='is_important'),
27 29 
         ),
28 30 
     ]